From 01fcfa3b96b9958cf9376b68d547b5a5ffe42219 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 22 Dec 2010 17:48:31 +0000 Subject: [PATCH] tools/hotplug: read /etc/default/xencommons if appropriate Since 22187:c41252a55a0a we have been installing our example xencommons settings file in either /etc/sysconfig or /etc/default, depending on whether /etc/sysconfig exists. However I omitted to add the code to /etc/init.d/xencommons to actually read either version of the file, although every other init script seems to have it. An effect of this misplaced/unread file is that the automatic tests don't cause xenconsoled to collect serial logs, because the tester edits whichever file actually exists. Signed-off-by: Ian Jackson --- tools/hotplug/Linux/init.d/xencommons | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/hotplug/Linux/init.d/xencommons b/tools/hotplug/Linux/init.d/xencommons index 40b7cbe94b..873f6884e8 100644 --- a/tools/hotplug/Linux/init.d/xencommons +++ b/tools/hotplug/Linux/init.d/xencommons @@ -18,7 +18,13 @@ # Description: Starts and stops the daemons neeeded for xl/xend ### END INIT INFO -test -f /etc/sysconfig/xencommons && . /etc/sysconfig/xencommons +if [ -d /etc/sysconfig ]; then + xencommons_config=/etc/sysconfig +else + xencommons_config=/etc/default +fi + +test -f $xencommons_config/xencommons && . $xencommons_config/xencommons XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid shopt -s extglob -- 2.30.2